Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure.

The build should no longer fail when linking with --no-add-needed

Previously, configure would clear FONTCONFIG_LIBS and
FONTCONFIG_CFLAGS.  This would break the build when compiling with a
linker that defaults to --no-add-needed.  For example:

  /usr/bin/ld: ftfont.o: undefined reference to symbol 'FcInit'

configure should no longer clear these variables.

Author: Matthias Klose <doko@ubuntu.com>
Date: Mon, 28 Feb 2011 01:02:41 +0100
Added-by: Rob Browning <rlb@defaultvalue.org>
Closes: #554324

diff --git a/configure.in b/configure.in
index baacfe4c9b15e10e45ca9e2fbca3dd56e197bb10..063971598f0f96b42e664f7cdc9b7f8535b10f20 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2044,11 +2044,7 @@ if test "${HAVE_X11}" = "yes"; then
     ## We used to allow building with FreeType and without Xft.
     ## However, the ftx font backend driver is not in good shape.
     if test "${HAVE_XFT}" = "yes"; then
-      dnl As we use Xft, we anyway use freetype.
-      dnl There's no need for additional CFLAGS and LIBS.
       HAVE_FREETYPE=yes
-      FONTCONFIG_CFLAGS=
-      FONTCONFIG_LIBS=
     fi
 
     HAVE_LIBOTF=no